Fix the package restore for arm64 and arm32 #12532
Conversation
|
@dotnet-bot test Windows_NT Arm64 |
|
/cc @BruceForstall |
tests/src/dir.props
Outdated
| @@ -31,7 +31,19 @@ | |||
| <PropertyGroup> | |||
| </PropertyGroup> | |||
| </When> | |||
| <When Condition="'$(OSGroup)'=='Windows_NT'"> | |||
| <When Condition="'$(OSGroup)'=='Windows_NT' AND '$(__BuildArch)'=='arm64'"> | |||
There was a problem hiding this comment.
Can you not use an OR here (arm64 OR arm)?
|
LGTM, other than the 1 comment. Guessing this got package restore working locally? |
|
Correct managed to get the restore working locally. I will work on the OR change. |
|
@jashook Thanks |
tests/src/dir.props
Outdated
| <TestNugetRuntimeId>win-$(__BuildArch)</TestNugetRuntimeId> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition="'$(OSGroup)'=='Windows_NT' AND '$(__BuildArch)'!='$(arm64)' AND '$(__BuildArch)'!='$(arm)'"> |
There was a problem hiding this comment.
Shouldn't this be:
<When Condition="'$(OSGroup)'=='Windows_NT' AND '$(__BuildArch)'!='arm64' AND '$(__BuildArch)'!='arm'">
?
There was a problem hiding this comment.
Yes that is a typo thank you for catching that
|
@wtgodbe , others: is there a reason we can't just name the arm/arm64 packages (or whatever this is naming) using the same naming scheme as x86/x64? |
jashook
force-pushed
the
fix_arm64_and_arm32_package_restore
branch
from
966cd34
to
987c2fc
Compare
|
@dotnet-bot test Windows_NT Arm64 |
|
@BruceForstall we only publish portable packages now, which have the prefix win-{arch}. So actually, @jashook, as part of this change it might be good to just change all testNugetRuntimeID's to win-{arch} for Windows, as today in CI we're probably downloading old win7-{arch} packages for x64 & x86. |
|
@BruceForstall I think part of the problem is the absence of arm64 linux nuget packages. #12372 And dotnet/corefx#21236 should fix that. |
|
@dotnet-bot test Windows_NT Arm64 Checked |
1 similar comment
|
@dotnet-bot test Windows_NT Arm64 Checked |
jashook
force-pushed
the
fix_arm64_and_arm32_package_restore
branch
from
987c2fc
to
0489dac
Compare
|
@dotnet-bot test Windows_NT Arm64 Checked |
|
Updated ptal @wtgodbe |
|
LGTM pending CI |
/cc @sdmaclea I am expecting this to fix the Arm64 Windows jobs.